Autogenerated HTML docs for v1.7.0-87-g0901d
diff --git a/gitattributes.txt b/gitattributes.txt index b396a87..d892e64 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -511,7 +511,8 @@ version (`%A`) and the other branches' version (`%B`). These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is -built. +built. Additionally, %L will be replaced with the conflict marker +size (see below). The merge driver is expected to leave the result of the merge in the file named with `%A` by overwriting it, and exit with zero
